Auto merge of #2217 - alexcrichton:cleanup, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 16 Dec 2015 21:14:02 +0000 (21:14 +0000)
committerbors <bors@rust-lang.org>
Wed, 16 Dec 2015 21:14:02 +0000 (21:14 +0000)
This From impl has been around for awhile.


Trivial merge